merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 30 Mar 2010 07:48:06 +0000 (16:48 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 30 Mar 2010 07:48:06 +0000 (16:48 +0900)

Trivial merge